Port the proc macro attributes to the new attribute parsing infrastructure #143607

JonathanBrouwer · 2025-07-07T19:08:31Z

Ports #[proc_macro], #[proc_macro_attribute], #[proc_macro_derive] and #[rustc_builtin_macro] to the new attribute parsing infrastructure for #131229 (comment)

I've split this PR into commits for reviewability, and left some comments to clarify things
I did 4 related attributes in one PR because they share a lot of their code and logic, and doing them separately is kind of annoying as I need to leave both the old and new parsing in place then.

r? @oli-obk
cc @jdonszelmann

JonathanBrouwer · 2025-07-07T19:11:03Z

compiler/rustc_expand/src/base.rs

+
+            // Not a built-in macro
+            None => (None, helper_attrs),
+        };


The logic here should be equivalent to the logic above, other than that this is a bit more readable and that we use the already parsed attribute rather than parsing it from scratch

JonathanBrouwer · 2025-07-07T19:13:59Z

tests/ui/feature-gates/issue-43106-gating-of-builtin-attrs.rs

@@ -57,7 +57,7 @@
 // see gated-link-args.rs
 // see issue-43106-gating-of-macro_escape.rs for crate-level; but non crate-level is below at "2700"
 // (cannot easily test gating of crate-level #[no_std]; but non crate-level is below at "2600")
-#![proc_macro_derive()] //~ WARN `#[proc_macro_derive]` only has an effect
+#![proc_macro_derive(Test)] //~ WARN `#[proc_macro_derive]` only has an effect


Note that a breaking change happened here! The code before this change would now produce an error.

Previously a proc_macro_derive applied to the crate could have any arguments it wants, it was not checked. This PR fixes this bug, and this now errors.

I discussed this privately with @jdonszelmann, and she said this is fine to change, though we can consider doing a crater run for this just to make sure if you wish.

rustbot · 2025-07-07T19:16:51Z

Some changes occurred in compiler/rustc_attr_parsing

cc @jdonszelmann

Some changes occurred in compiler/rustc_passes/src/check_attr.rs

cc @jdonszelmann

Some changes occurred in compiler/rustc_attr_data_structures

cc @jdonszelmann

rustbot · 2025-07-07T20:39:47Z

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

jdonszelmann · 2025-07-07T21:07:32Z

This could use a little squash I think

jdonszelmann · 2025-07-07T21:07:48Z

Not everything, but some commits are a bit small

JonathanBrouwer · 2025-07-08T06:25:06Z

@jdonszelmann I've squashed things down a bit. I'm experimenting a bit with what commit size is best for reviewability, this was clearly too much of a good thing :P

compiler/rustc_attr_parsing/src/attributes/proc_macro_attrs.rs

JonathanBrouwer · 2025-07-08T08:47:12Z

r? @jdonszelmann
@rustbot ready

rustbot · 2025-07-08T08:47:17Z

jdonszelmann is not on the review rotation at the moment.
They may take a while to respond.

bors · 2025-07-08T21:41:12Z

☔ The latest upstream changes (presumably #143645) made this pull request unmergeable. Please resolve the merge conflicts.

JonathanBrouwer · 2025-07-11T11:41:35Z

^ Rebased

jdonszelmann · 2025-07-11T15:17:54Z

Discussed with @oli-obk, we're going to do a crater run for this one because it's technically a breaking change.
First a try build, no need to rebase until crater's done which will take a bit :)

@bors try

Port the proc macro attributes to the new attribute parsing infrastructure Ports `#[proc_macro]`, `#[proc_macro_attribute]`, `#[proc_macro_derive]` and `#[rustc_builtin_macro]` to the new attribute parsing infrastructure for #131229 (comment) I've split this PR into commits for reviewability, and left some comments to clarify things I did 4 related attributes in one PR because they share a lot of their code and logic, and doing them separately is kind of annoying as I need to leave both the old and new parsing in place then. r? `@oli-obk` cc `@jdonszelmann`

bors · 2025-07-11T15:19:05Z

⌛ Trying commit f8c757f with merge 360f8e6...

jdonszelmann · 2025-07-11T15:23:58Z

@traviscross what's the proper way to notify T-lang on this? What label, and could you add that?

tmandry · 2025-07-16T15:16:02Z

@rfcbot reviewed

traviscross · 2025-07-16T15:16:05Z

@rfcbot reviewed

rfcbot · 2025-07-16T15:16:20Z

🔔 This is now entering its final comment period, as per the review above. 🔔

bors · 2025-07-18T08:51:29Z

☔ The latest upstream changes (presumably #144109) made this pull request unmergeable. Please resolve the merge conflicts.

rfcbot · 2025-07-26T15:18:29Z

The final comment period, with a disposition to merge, as per the review above, is now complete.

As the automated representative of the governance process, I would like to thank the author for their work and everyone else who contributed.

This will be merged soon.

Signed-off-by: Jonathan Brouwer <[email protected]>

JonathanBrouwer · 2025-07-26T18:41:59Z

Perfect, @rust-lang/lang crater seems clear, r=me with your approval

Rebased. As stated above I think @jdonszelmann already reviewed this so I think this is ready to be merged?

traviscross · 2025-07-27T11:34:05Z

FCP is complete, verified this doesn't need changes in the Reference, and reviewed the differences in the rebase, which look reasonable, so...

@bors r=jdonszelmann,traviscross rollup

bors · 2025-07-27T11:34:08Z

📌 Commit 97b6521 has been approved by jdonszelmann,traviscross

It is now in the queue for this repository.

rustbot assigned oli-obk Jul 7, 2025

rustbot added A-attributes Area: Attributes (`#[…]`, `#![…]`) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Jul 7, 2025

JonathanBrouwer commented Jul 7, 2025

View reviewed changes

JonathanBrouwer marked this pull request as ready for review July 7, 2025 19:16

rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 7, 2025

This comment has been minimized.

Sign in to view

JonathanBrouwer force-pushed the proc_macro_attrs branch from a6b7f55 to 432cde9 Compare July 8, 2025 06:24

jdonszelmann mentioned this pull request Jul 8, 2025

Tracking issue: Attribute refactor #131229

Open

9 tasks

jdonszelmann reviewed Jul 8, 2025

View reviewed changes

compiler/rustc_attr_parsing/src/attributes/proc_macro_attrs.rs Show resolved Hide resolved

JonathanBrouwer force-pushed the proc_macro_attrs branch from 432cde9 to 7a60c84 Compare July 8, 2025 08:46

rustbot assigned jdonszelmann and unassigned oli-obk Jul 8, 2025

JonathanBrouwer force-pushed the proc_macro_attrs branch 3 times, most recently from 2b42dae to f8c757f Compare July 11, 2025 11:41

rfcbot added proposed-final-comment-period Proposed to merge/close by relevant subteam, see T-<team> label. Will enter FCP once signed off. disposition-merge This issue / PR is in PFCP or FCP with a disposition to merge it. labels Jul 16, 2025

rfcbot added final-comment-period In the final comment period and will be merged soon unless new substantive objections are raised. and removed proposed-final-comment-period Proposed to merge/close by relevant subteam, see T-<team> label. Will enter FCP once signed off. labels Jul 16, 2025

rustbot mentioned this pull request Jul 26, 2025

Tracking issue for release notes of #143607: Port the proc macro attributes to the new attribute parsing infrastructure #144504

Open

JonathanBrouwer added 7 commits July 26, 2025 20:25

Add attributes to AttributeKind

39235be

Implement check_attr

c4e7cb8

Parsers for the attributes

2f50c78

Signed-off-by: Jonathan Brouwer <[email protected]>

Use the new attributes throughout the codebase

ec63700

Signed-off-by: Jonathan Brouwer <[email protected]>

Update test results

fea7809

Signed-off-by: Jonathan Brouwer <[email protected]>

Remove now un-used code

e64f75b

Signed-off-by: Jonathan Brouwer <[email protected]>

Fix tooling

97b6521

Signed-off-by: Jonathan Brouwer <[email protected]>

JonathanBrouwer force-pushed the proc_macro_attrs branch from 8166ced to 97b6521 Compare July 26, 2025 18:41

rustbot added the T-clippy Relevant to the Clippy team. label Jul 26, 2025

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 27, 2025

Port the proc macro attributes to the new attribute parsing infrastructure #143607

Are you sure you want to change the base?

Port the proc macro attributes to the new attribute parsing infrastructure #143607

Conversation

JonathanBrouwer commented Jul 7, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

JonathanBrouwer Jul 7, 2025

Choose a reason for hiding this comment

Uh oh!

JonathanBrouwer Jul 7, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

rustbot commented Jul 7, 2025

Uh oh!

This comment has been minimized.

rustbot commented Jul 7, 2025

Uh oh!

jdonszelmann commented Jul 7, 2025

Uh oh!

jdonszelmann commented Jul 7, 2025

Uh oh!

JonathanBrouwer commented Jul 8, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

JonathanBrouwer commented Jul 8, 2025

Uh oh!

rustbot commented Jul 8, 2025

Uh oh!

bors commented Jul 8, 2025

Uh oh!

JonathanBrouwer commented Jul 11, 2025

Uh oh!

jdonszelmann commented Jul 11, 2025

Uh oh!

bors commented Jul 11, 2025

Uh oh!

jdonszelmann commented Jul 11, 2025

Uh oh!

tmandry commented Jul 16, 2025

Uh oh!

traviscross commented Jul 16, 2025

Uh oh!

rfcbot commented Jul 16, 2025

Uh oh!

bors commented Jul 18, 2025

Uh oh!

rfcbot commented Jul 26, 2025

Uh oh!

JonathanBrouwer commented Jul 26, 2025

Uh oh!

traviscross commented Jul 27, 2025

Uh oh!

bors commented Jul 27, 2025

Uh oh!

Uh oh!

JonathanBrouwer commented Jul 7, 2025 •

edited

Loading

JonathanBrouwer Jul 7, 2025 •

edited

Loading

JonathanBrouwer commented Jul 8, 2025 •

edited

Loading